From 7b7fe14b2352a54c8512df57ef9dc074426a9912 Mon Sep 17 00:00:00 2001 From: nana-4 Date: Sun, 12 May 2019 17:40:47 +0900 Subject: [PATCH] Adwaita: Don't round the non-csd menu corners Otherwise, the menu will have ugly black corners. See https://gitlab.gnome.org/GNOME/gtk/issues/1661 --- gtk/theme/Adwaita/_common.scss | 6 ++++-- gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++-- gtk/theme/Adwaita/gtk-contained.css | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 1faadd14a3..43f4be6114 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2064,9 +2064,11 @@ menu, padding: 4px 0px; background-color: $menu_color; border: 1px solid $borders_color; // adds borders in a non composited env - border-radius: $menu_radius; - .csd & { border: none; } // axes borders in a composited env + .csd & { + border: none; // axes borders in a composited env + border-radius: $menu_radius; + } &:backdrop { background-color: $backdrop_menu_color; } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 8f6daa89ef..d5b09205c2 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -824,9 +824,9 @@ menubar .csd.popup decoration, .menubar .csd.popup decoration { border-radius: 0 .background.popup { background-color: transparent; } -menu, .menu, .context-menu { padding: 4px 0px; background-color: #2f2f2f; border: 1px solid #1b1b1b; border-radius: 5px; } +menu, .menu, .context-menu { padding: 4px 0px; background-color: #2f2f2f; border: 1px solid #1b1b1b; } -.csd menu, .csd .menu, .csd .context-menu { border: none; } +.csd menu, .csd .menu, .csd .context-menu { border: none; border-radius: 5px; } menu:backdrop, .menu:backdrop, .context-menu:backdrop { background-color: #313131; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index a7519f607a..6e4fc8fde6 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -832,9 +832,9 @@ menubar .csd.popup decoration, .menubar .csd.popup decoration { border-radius: 0 .background.popup { background-color: transparent; } -menu, .menu, .context-menu { padding: 4px 0px; background-color: #ffffff; border: 1px solid #cdc7c2; border-radius: 5px; } +menu, .menu, .context-menu { padding: 4px 0px; background-color: #ffffff; border: 1px solid #cdc7c2; } -.csd menu, .csd .menu, .csd .context-menu { border: none; } +.csd menu, .csd .menu, .csd .context-menu { border: none; border-radius: 5px; } menu:backdrop, .menu:backdrop, .context-menu:backdrop { background-color: #fcfcfc; } -- 2.30.2